Skip to content

Conversation

@sprt
Copy link
Contributor

@sprt sprt commented Dec 7, 2023

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

This upgrades both vanilla Kata and Kata-CC to v3.2.0.azl0, which is based on upstream v3.2.0 plus some Microsoft changes. The sources for both packages are now identical and they differ only in build flags and runtime components (e.g. IGVM vs initrd).

Depends on: microsoft/kata-containers#154

Minor limitation to be addressed in the next release: https://microsoft.visualstudio.com/OS/_workitems/edit/48983660

Does this affect the toolchain?

NO

Testing

Conformance: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=505034&view=results
Buddy build against PR branch (rather than our internal Kata automation): https://dev.azure.com/mariner-org/mariner/_build/results?buildId=505943&view=results

@sprt sprt changed the title Update kata-containers-cc spec to align with new sources kata-containers-cc: generate configuration-clh-snp-debug.toml Jan 22, 2024
@sprt sprt changed the title kata-containers-cc: generate configuration-clh-snp-debug.toml [BLOCKED] kata-containers-cc: generate configuration-clh-snp-debug.toml Jan 22, 2024
@sprt sprt requested a review from manuelh-dev January 22, 2024 21:37
sprt added a commit to microsoft/kata-containers that referenced this pull request Jan 24, 2024
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in
microsoft/azurelinux#6942.  Already done this way
upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
sprt added a commit to microsoft/kata-containers that referenced this pull request Jan 24, 2024
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.  Already
done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
@sprt sprt changed the title [BLOCKED] kata-containers-cc: generate configuration-clh-snp-debug.toml kata-containers-cc: generate configuration-clh-snp-debug.toml Jan 24, 2024
sprt added a commit to microsoft/kata-containers that referenced this pull request Jan 24, 2024
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
@sprt sprt force-pushed the sprt/katacc-new-branch branch from fe7ec06 to 4256986 Compare January 25, 2024 16:32
@sprt sprt changed the title kata-containers-cc: generate configuration-clh-snp-debug.toml Adapt Kata specs for msft-main Jan 25, 2024
@sprt sprt force-pushed the sprt/katacc-new-branch branch 2 times, most recently from 55eab9b to fef926c Compare January 25, 2024 23:58
@sprt sprt changed the title Adapt Kata specs for msft-main [Kata] Align vanilla Kata sources with Kata-CC sources Jan 30, 2024
@sprt sprt force-pushed the sprt/katacc-new-branch branch 2 times, most recently from 9e161a8 to 34e7350 Compare January 31, 2024 17:29
@sprt sprt marked this pull request as ready for review January 31, 2024 17:46
@sprt sprt requested a review from a team as a code owner January 31, 2024 17:46
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 22, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 24, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 25, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 25, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 25, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 26, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 26, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 26, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 26, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 26, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 28, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 28, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 28, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 29, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 31, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
danmihai1 pushed a commit to microsoft/kata-containers that referenced this pull request Mar 31, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
Redent0r pushed a commit to microsoft/kata-containers that referenced this pull request May 13, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
Redent0r pushed a commit to microsoft/kata-containers that referenced this pull request May 13, 2025
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants